From ad96220448eda3858b60a20e37f18b609f58c522 Mon Sep 17 00:00:00 2001 From: Alex Monday Date: Mon, 4 Mar 2019 21:51:48 +0500 Subject: [PATCH] Adwaita: Replace spinbutton border-radii with variables Replace hardcoded border-radius values with $button_radius variable on spinbuttons. --- gtk/theme/Adwaita/_common.scss | 12 ++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++++------ gtk/theme/Adwaita/gtk-contained.css | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 90a891755a..a3e64143ca 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1220,9 +1220,9 @@ spinbutton { &:dir(rtl) { border-style: none solid none none; } } - &:dir(ltr):last-child { border-radius: 0 3px 3px 0; } + &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; } - &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } + &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; } } } @@ -1272,9 +1272,9 @@ spinbutton { box-shadow: none; } - &:dir(ltr):last-child { border-radius: 0 3px 3px 0; } + &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; } - &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } + &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; } } } @@ -1315,12 +1315,12 @@ spinbutton { } %top_button { - border-radius: 3px 3px 0 0; + border-radius: $button_radius $button_radius 0 0; border-style: solid solid none solid; } %bottom_button { - border-radius: 0 0 3px 3px; + border-radius: 0 0 $button_radius $button_radius; border-style: none solid solid solid; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index ac9cae5f68..70582ada90 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -523,9 +523,9 @@ spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(91, 91, 91, 0.3 spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } -spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; } @@ -537,9 +537,9 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3 .osd spinbutton:not(.vertical) button:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #89888b; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } spinbutton.vertical:disabled { color: #919190; } @@ -551,9 +551,9 @@ spinbutton.vertical text { min-height: 32px; min-width: 32px; padding: 0; border spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } -spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } +spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; } -spinbutton.vertical button.down { border-radius: 0 0 3px 3px; border-style: none solid solid solid; } +spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; } .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b982e6d5c6..aa5f8ed3bc 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -531,9 +531,9 @@ spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(212, 207, 202, spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } -spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; } @@ -545,9 +545,9 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3 .osd spinbutton:not(.vertical) button:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #89888b; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } spinbutton.vertical:disabled { color: #929595; } @@ -559,9 +559,9 @@ spinbutton.vertical text { min-height: 32px; min-width: 32px; padding: 0; border spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } -spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } +spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; } -spinbutton.vertical button.down { border-radius: 0 0 3px 3px; border-style: none solid solid solid; } +spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; } .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -- 2.30.2